bitkeeper revision 1.1159.1.322 (41865b3esLMCK45rPPwl2IDgdedolA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/ach61/tmp/xeno.bk

diff --cc xen/arch/x86/pdb-stub.c
Simple merge

diff --cc xen/arch/x86/traps.c
index df0ccfdf688a14180b2278b7a2e8b28a83a10408,222a3f916a5ed93aa72eba428d3067957074fa7c..8f6cb3c69458c41cb5fad7bfb78c28f528394f08
--- 1/xen/arch/x86/traps.c
--- 2/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@@ -582,13 -584,15 +582,13 @@@ static void nmi_softirq(void
          return;
  
      if ( test_and_clear_bit(0, &nmi_softirq_reason) )
 -        send_guest_virq(d, VIRQ_PARITY_ERR);
 +        send_guest_virq(dom0, VIRQ_PARITY_ERR);
  
      if ( test_and_clear_bit(1, &nmi_softirq_reason) )
 -        send_guest_virq(d, VIRQ_IO_ERR);
 -
 -    put_domain(d);
 +        send_guest_virq(dom0, VIRQ_IO_ERR);
  }
  
- asmlinkage void math_state_restore(struct pt_regs *regs, long error_code)
+ asmlinkage void math_state_restore(struct xen_regs *regs, long error_code)
  {
      /* Prevent recursion. */
      clts();

diff --cc xen/common/keyhandler.c
Simple merge

diff --cc xen/drivers/char/console.c
index 7b82f877fe66588fb39fc0f56c446864ec734d7b,2199ffda37af381da9f5edc9edd46ef6ad40e11f..51e97fc82f28340c65f61e68f20a1350929b784f
--- 1/xen/drivers/char/console.c
--- 2/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@@ -243,8 -243,10 +243,8 @@@ static void switch_serial_input(void
                 input_str[xen_rx], opt_conswitch[0], input_str[!xen_rx]);
  }
  
- static void __serial_rx(unsigned char c, struct pt_regs *regs)
+ static void __serial_rx(unsigned char c, struct xen_regs *regs)
  {
 -    struct domain *d;
 -
      if ( xen_rx )
      {
          handle_keypress(c);

diff --cc xen/include/xen/sched.h
Simple merge